Makefile: address problems with updating deps#512
Merged
philips merged 1 commit intoopencontainers:masterfrom Jan 18, 2017
Merged
Makefile: address problems with updating deps#512philips merged 1 commit intoopencontainers:masterfrom
philips merged 1 commit intoopencontainers:masterfrom
Conversation
Member
|
LGTM |
Contributor
Author
|
@opencontainers/image-spec-maintainers PTAL |
jonboulle
suggested changes
Jan 13, 2017
Makefile
Outdated
| glide-vc --only-code --no-tests --use-lock-file | ||
| # see http://sed.sourceforge.net/sed1line.txt | ||
| find vendor -type f -exec sed -i -e :a -e '/^\n*$$/{$$d;N;ba' -e '}' "{}" \; | ||
| find vendor -type f -exec sed -i "" -e :a -e '/^\n*$$/{$$d;N;ba' -e '}' "{}" \; |
Contributor
There was a problem hiding this comment.
This doesn't work for me, but -i="" does
This fixes the `glide-vc` command to use the glide.lock file to resolve the dependencies, ensuring that we don't delete test dependencies. We also fix a sed line to working correctly on other platforms as well ensure that the tools get updated. Signed-off-by: Stephen J Day <stephen.day@docker.com>
stevvooe
force-pushed
the
fix-makefile
branch
from
a160fb5 to
c29a55a
Compare
Contributor
Author
|
@jonboulle @vbatts Address the problem identified by @jonboulle. |
jonboulle
approved these changes
Jan 16, 2017
Contributor
|
lgtm |
Contributor
|
LGTM |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This fixes the
glide-vccommand to use the glide.lock file to resolvethe dependencies, ensuring that we don't delete test dependencies. We
also fix a sed line to working correctly on other platforms as well
ensure that the tools get updated.
Signed-off-by: Stephen J Day stephen.day@docker.com